Auto merge of #1383 - alexcrichton:issue-1381, r=huonw
authorbors <bors@rust-lang.org>
Fri, 6 Mar 2015 00:47:35 +0000 (00:47 +0000)
committerbors <bors@rust-lang.org>
Fri, 6 Mar 2015 00:47:35 +0000 (00:47 +0000)
commit0fefa003284a0f7e3e65bfd2cef7b2be6c543a20
tree93eef429ea9b1b0e177f8f2d9caa5ec541f4e6a4
parentdd7c7bd17472a4bbe83b879980f0d717d2cdd6f1
parent5955ea8a53af40f1da118ad708c8144a0035bf2a
Auto merge of #1383 - alexcrichton:issue-1381, r=huonw

Ensure we don't get erroneous information about invalid log levels or such.

Closes #1381